From: Matthieu Gallien Date: Tue, 11 Feb 2025 10:14:43 +0000 (+0100) Subject: Merge pull request #7815 from alexknop/conflictdialogfix X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~2^2~68 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=2cb35b951a100c2087b9707c44557e529ae1c52f;p=nextcloud-desktop.git Merge pull request #7815 from alexknop/conflictdialogfix Fix Height for Resolve Conflicts Dialog --- 2cb35b951a100c2087b9707c44557e529ae1c52f